merge
authorkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Tue, 28 Nov 2006 11:47:28 +0000 (11:47 +0000)
committerkfraser@localhost.localdomain <kfraser@localhost.localdomain>
Tue, 28 Nov 2006 11:47:28 +0000 (11:47 +0000)

Trivial merge